Skip to content

Refactor the code

Refactor the code #748