Tidy up Handler declarations