More comment and format