don't need a lib dir
remove underscore dependency
simplify
comma-first only var declarations