refactoring, cleanup, configuration management