cleaned up some of the hard coded variables