Housekeeping

Cleaned programming up, and modified comments for clarity.