Removed unnecessary code
Simplified parameter check for buildSimpleCondition()