cleaning up for review