Tried to get rid of useless comments