cleaned code unused local vars