Clean up that last bit a little!