Eliminated extra spaces at some eol