Fixed some scrutinizer complaints