Update comments. Code tidy.