fix for #2, more idomatic type names, removed the 'Cass'