slightly clean up