simplify
refactoring