Simplifying functionality, refactoring code, splitting logic