Refactored code to move data into Maptastic class and minor improvements