Got rid of a random return