fixed a bug where the trigger handler wasnt bound to the right scope (State)
minor style change
pass all tests