Clearer class definitions

@bfulton