#24 : Fix Scrutinizer Issues