Make all of everything consistent

There were some inconsistencies so I fixed them :syringe: