improved style ( #18 )