refactoring, mini-changes