Style refactor

Style all the things