Reorder fields for readability

Closes #50.