Adding organization and comments/documentation