Combine event loop cleanup with other style/modernization cleanup

Combine event loop cleanup with other style/modernization cleanup #28