[#41] Minor refactoring