remove whitespace + removed TODO