added  replacement of single line declarations with multiple lines