Some other changes

Including the spaces to tabs