Minor tidy and commenting.