Skip to content

Update according to code review #267

Update according to code review

Update according to code review #267