Cleanup
Moved some operators
Cleanup