Updated structure and comments.