started refactoring #19