[#21] Reformat code