-Refactoring to simplify code.