Lots of linting and a little bit of refactoring in the Rapper model