Messy code clean up

Printable View