Windows fixes + clean imports and file format