#41 Refactoring