Fix style issues in map