missed removal of two shorthand vars