More OCD edits and organization.