Clean up the use of modifiers and semicolons

This is a cleanup task. The goal is to remove redundant and sort the remaining modifiers, remove semicolons, and fix typos along the way.