Clean up imports and fix look up bug thing