fix(hooks): improving hooks