Removed tutor attrs, improve dict readability