Tidy up and comment expansion.
1 file changed