Minor improvements

Some typos, imports and variables names have changed.