[#104] Refactoring
[#104] Refactor code