Cleanup code

- Remove unused import;
- Remove unused variable;
- Correct indentation.
This will be used eventually.