Removing comments. final polishing of the code