Code clean up

Cleaned up unnecessary spaces, replaced tabs with spaces and fixed line
terminators.