Check Style ran

Tyler ran the Check Style plugin and tried to fix most of the ones that
made sense to fix