Cleaning up, adding comments
Cleaning code, adding comments