Cleanup and fix imports