Remove whitespaces, fix main comments and sub comments