update comments, structure