More cleaning and comments.