clean up a tad more