"Bringing Non-Conforming Uses Into Conformity"