Tidying and commenting.