Tidy imports and fix some minor typos
Version 0.6.1