#59 improve style