Refactor Form I defective_base