Removed unnesecary if