More Cleaning

Cleaning up the code to be easier to read and understand.