cleaned up my changes