Skip to content

Code Review fixes

Code Review fixes #19