some whitespace, comment, and print debugging cleanup