Tidy imports and fix some minor typos