removed redundant else