Rubocop cleanup

This is the final commit before submission, anything after this is my
own work on my own time