Prior to factoring out classes