Cleanup and minor edits.