update comments, clean up