Refactoring things is my hobby ;)