- converted method comments to blocks
- some tidy up