cleaned up buildout a bit