Removed some redundancy.