Simplify output format, variable name bugfix