Some cleanup =>
  - remove unused import
  - remove useless braces
  - remove useless semicolon
  - correct package declarations
  - correct Global declaration in configuration
  - etc