Refactor the stars