Added Rules to refactor several passes