Skip to content

Remove duplicate code and improve #382

Remove duplicate code and improve

Remove duplicate code and improve #382