A little clean up
Add graceful shutdown keep alive handler