Cleanup code a bit using eventlet branch