Removed some redundancies.