Fix a few code style things
This should reduce the number of warnings given by the code style check. The remaining warnings are questionable.
This should reduce the number of warnings given by the code style check. The remaining warnings are questionable.