Just cleaning up the code from the last commit and putting everything in
the right place and so on