Removed some redundancy