Made more code visible in output files