Cleaned up Operations