re #139 - Clean-up, fix docblocks