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