cleaning up code, starting to use John Pap's style guide.