minor edits, removing comments, etc