Renamed Operations [fixes #29]
Cleanup