Cleanup to Topfield classes, and date sort