[#22] improve style