tidied up package for building