Small edits and cleanup