Reviewed the files forked from HP, adjusted indentation to test the roundtrip