fix indent and new parse_keys func