Tidy up and build script added