Removed redundant if clause