boom. removed console logs, made better use of variables