added a little cleanup