Shorted handlers to h
Refactored handlers