Unrelated, cleanup a few of the methods in BBContainer, some can be shorter, others can be final