Minor method extraction
Simplify output