cosmetic
shutdown handler simplified