EA: Code refactoring