cleanup and fix grammar for mutability