Removed redundancies