removed extraneous class formalism