clean up, reorganize, and make sure my test passes