Clean imports
Resolve quote style issues
Move to new style guide