Removed trailing spaces

Continuation of work done in previous commit.