Tidying and comments.