style cleanup, map alignment