[#6]Small refactoring