Make things a bit cleaner, possibly.