Skip directly to content

Refacto