hoducha Code refactoring