Revert constructor/destructor comments and fix one scrutinizer code style issue.