Refactoring

:happy: