removed hard-coded vals replaced w/ constant variables