Implemented smarter comment chunks