Adressing reviewer comments, thanks @skyluc