Refactoring of Code with EE suggestions