Retab done in the files to proper indentation
Fixing error in the syntax of the conditions