Minor cleanup to prepare this for EduCon