More refactoring work ....