Get this more or less in line with code formatting standard.