refactoring weight class