adressing reviewer comments, thanks @skyluc