refactor Handler stuff into an interface
doc and minor naming cleanup