Lots of linting, prepping for next phase