Skip to content

Refactor criteria

Refactor criteria #43