Commits some small changes before major refactoring.