Style fixes for scrutinizer