A little refactoring work done