Tidies up the build