Fixed some redundancy