Whitespace removal and reduced redundant query.