Lint fixes: unused import, tabs