Cleanup of various inline comments