Removed redundant if statement