cleaning up ch 5