Already refactoring, this project is in good hands