Removed some redundancies