Making things more consistent