tidy up, closes #26