imenik refactoring