rearranged hit checks and clean up