code cleanup of main event loop