Clean-up
Optimize and simplify