Re-wrote generators

- Import cleanup