Removed redundant if