Cleanup comments and code (no functional changes).