renamed few variables