A bit of documentation and cleanup.