a little refactoring in preparation for building projects