cleaned up additional repitition