Trying to make things more consistent