Refactoring and ensuring that the build works.