More refactoring :O