More simplification on rbhandler