Refactoring indicator classes