compacted handlers into one class