Eldar: Code refactoring