Tidying and comments