Replaced tabs with spaces, and some other minor changes.