Tidied up build system