Refactoring, nothing too important