Review and clean up of extending section