Polish the I/O a bit