Refactor; remove unused imports and template-generated comments
Refactor; improve code based on automatic code inspection; remove test main methods