Comments, tidyup.