Minor simplifications/style changes
Level map