Changed some stuff to be more consistent