Code refactoring

:^)