[Part 1] Remove Redundancies and duplication