minor name updates to class, removal of final