Documentation
Refactoring
Unused imports