Rename to Simplify and refactor

GO VERBS!