Refactored the stars