Use Hipe for performance + Small cleanup