Update general structure and comments