#32 Refactoring