update comments and create utils class