Cosmetics.

Move an "import" to the correct block.
Merge pull request #3 from legordian/master

Cosmetics.