Little improvements according to Scrutinizer