Removed some more redundancies