Removing a little more repitition