Clean up imports and variable names