Reformat a little, remove warnings.