Clean up comments and a few code tweaks for clarity or efficiency

[bpbond]

I want to echo Steph -- this is clean, clear code @leeyap . Nice job and thank you!