Cleanup: removed log, organized imports