Simplified the handlers

Sometimes simplicity is good. No need to create binders.