Skip to content

Refactor to simplify #536

Refactor to simplify

Refactor to simplify #536