changed exit code
removed odd line
removed unused event router