Fixed some redundancies.