Removed redundant properties and methods.
Tweaked the map a bit.