Consistent output

Closes #36