Remove redundancy and ugliness.