Add @key_path; remove blank lines with white space