tabs fixed and unused variable removed