Clean Up Code

[amoghbl1]

This seems way too generic, maybe sub issues can be opened below this one which are more specific.