clean up handlers a lil