reworking/removing redundancies