removed used imports
style guide keywords before maps
renaming, style guide
style guide improvements