Code tidy and comments.