use one handler for all and minor clean up

Change-Id: Iaf5a63c08fae8376926abdcc55dc54c422e9b911