Cleanup & simplify.
Simplify code.