Added style guide conformance, fixed map errors