housekeeping
A little refactoring