Removed ifs to identify operator