tidy up custom hooks