Cleanup of internals.
Inline comment cleanup.