Make things a little cleaner