updating comment header, and slight code cleanup
a little more comment/code cleanup