Tightened up code in handlers
Functioning again