Skip to content

Code refactor

Code refactor #743