fixing some redundancy