Got rid of static numbers

Got rid of static numbers for dynamic variable set by user