Skip to content

More refactor

More refactor #332