Improve header comments