fix scrutiniser's suggestions