fixed var and function naming