Tidying up the build