AnewsStore code cleanup