update comments and clean imports