Fixed TODO, removed white space at the end of the Lines

ticket #726