Better logging
Removed unused import
Cleanup