Conform query style to existing standards