Tidied up some IO Ops