minor changes: whitespace, comments, removed extraneous line of code