Mutation refactor

Just some basic cleanups.