General Housekeeping

Removed extra lines, and added some commenting.