Refactor full & row output

Addresses #260