improvements for comments