Reduced some redundancy.