Just a bit more comment tidying