Code refactorzzz