Cleanup imports
Fixed argument confusing DW