remove out_do_z, update comments (whitespace)