Changed some things that bothered me (cosmetic)