Clean up things a little