Fix indentation.
Simplify code, remove dead code.