Correct identation and remove unused variables.