Improve presentation of sections 4 and 5