Removing some redundancy