Refactor - removed right side spaces

Refactor - removed right side spaces

And tabs are changed to spaces in some files.