Changed some minor things for consistancy