Much neater this way

Closes #32