[#530] Reformat