Added arbitration implementation
Cleanup code