Fix imports
Fiy typos
Merge pull request #14 from tbeu/t12-remove-defaults

Fix imports and typos