improved terms structure and style

alpha 7.0.3