Bit of cleanup done

About to finalize writeout method