Refactoring

:D