Cleaning up imports and names