clean up as suggested by Eric