Skip to content

Code review fixes

Code review fixes #6