Removed unecessary if condition