removed code redundancy