Better var names
Safer use of private _location var
Remove unnecessary space