Bugfix: cleaned up unnecessary spaces

- Bugfix: cleaned up unnecessary spaces, replaced tabs with spaces and
  fixed line terminators
  [alecghica]