Removing trailing spaces
Added item to ToDo