More refactoring
more refactoring