Explicit import Entry

Instead of `import *`
Cosmetic changes

Two empty lines before `class` definitions