Refactor - removed right side spaces

And tabs are changed to spaces in some files.
Merge pull request #216 from grogy/refactor-spaces

Refactor - removed right side spaces