[#39] Minor refactoring to @mchmielarz fix