Clean up :)

These are the necessary changes so the PR is ready to merge for me too.