Changed format of expressions to solve JSHint issue.