Code cleanup in StatusHandler