refactoring: class name optimalization
screenshots