Small edits, clean up