removed function and updated var names