Tidying up build process