Get rid of count variable