Added first batch of fixed
- unused imports
- documentation fixes
- refactored related fields