Made things more consistent