Star Rating integration (1)

+ cleanup