Minor clean and comments.