Cleaned up a few IO things.