MapStyles refactor