Skip to content

Fix/code refactor

Fix/code refactor #57