CE-108 Add isTop200 call and clean-up