Remove useless comments and format code