A little cleanup/safety