cleaned up events controller