code cleanup
support hwp v3.0