clean up and review