Cleanup, request handler now take (req, params)