remove tailing white-spaces

rebased #260