Fixing spacing of staff
Fixed unnecessary state machine in the staff event handler