Cleaned up schedule and sort classes