refactor

add helper classes