Fix style and wording of imports. Fixes #324.