Fix missing -
Remove unused utility functions
Rename a few operands