#58 tidied a few comments