Skip to content

Code refactoring

Code refactoring #940