Make section 3 more organized