cleaned out redundancy