changed everything to ints now.  Eliminated some useless declarations