Finishing IO tidy up