Cleaning things a bit