Fixed requested issues

Flattened if().
changed from single to double quotes.