indention clean up; remove dead code