Corrected parser/formatter