Improve comment types and variable sections