Revert "Comments and fiddly bits"

This reverts commit f164d73ff071d3e0f94433adc0344ef90e3ba0e8.