More refactoring :-)