Incooperate Review Comments

Thx @f-schmitt-zih!