style/coding patches suggested by scrutiniser-ci