little refactoring work, getting back to it :P