[#12] improved coding style