Fixed Codestyle
Fixed name of renamed function
Use correct variable..