First pass on code improvement for scrutinizer CI