Feature/fix remarks from review