tidied up (related to #34)