[#38]: Refactoring