Tidying up build steps