[#41] Minor refactoring
fixes #41