Remove dead global ref
Make var names for convention