Work on structured comments