Removed operators, renamed some functions, as advised by Evan.