Minor code optimizations and used colour shorthand.
Merge pull request #1553 from pjackson28/feature-geomap

Minor code optimizations and used colour shorthand