add route-controller and controller collection; improve formatting