Refactored FaceStar (2nd pass)