Code cleanup, rewrote wrong comments