General refactoring
When did I even use this?