Tidied up for build project