Fixed white space, removed trailing chars