Refactored star check