[#9] Refine style