Comment structure changed