Remove unused comments and format correctly.