cleanup of logic for class bid