minor edits, review code