minor refactoring
fix wasway and hatoh issues