Reorder comments at the top, change variable names for clarity, and remo...

...ve string outputs in exchange for variables