Change function nouns to verbs.
Clean up code.