Simplify handler types

Should be more beginner friendly this way.

Fixes #1