Handlers refactoring #2

Open
optclblast wants to merge 2 commits from handlers into master

2 Commits