Got rid of more comments