Refactorings (not working)
In progress