Frans's changes and replace tabs with spaces