removed some  redundancies