remove dead code, fix indentation