remove some comments
fix double-initialization bug