Clean up minor things everywhere for consistency