More refactoring :D