clean up and see if this passes tests