Mini-reformat code. Improve the order