A bunch of code cleanup
Privatized map.objects

Now it is a local private var called _objectDefinitions that other
classes access through a getter