minor adaption for style