A few more minor edits and clean up