make mapstyle overrideable
removed some crud