+ code cleanup
+ remove unused imports
+ cleanup code