minor refactor too how things get built