improving a little bit comments and removing stupid ones