Cleaning up some 80 character line limits