Cleaned up I/O a little more.