Reformatted code according to Scrutinizer reports.