- fixed unused imports
- fixed comments