a little more clenaup