More cleaning things up