Updated var names in method