a little refactor, cleanup