Removed some redundancy in definitions