[REFACTOR] use less awkward formatting