Got rid of dumb code