hygienic bindings and some cleanup