disquss comment added, cleanup