Redundant code and commented lines are removed