Fixed some Redundancies