Made everything much more consistent