[#2] Refactoring in progress