replaced var naming and some strings