changed tabs to spaces, some other changes