Fix indentation
Remove unused variables