Working on comment enhancement