Tidy up.
Tidy up.
Simplify and tidy up code.