[CLEANUP] Some cleanups suggested by scrutinizer