Skip to content

Update according to code review #118

Update according to code review

Update according to code review #118