standardize on a more aesthetic formatting for query structures