StarSizeCalculator refactoring