Cleaning up and adding operator hash lookup