More refactored stars