just formatting changes
routefn macro replaces long handler definitions
remove handler definitions, replace with macro part ii