Skip to content

Simplify handlers

Simplify handlers #4