cleanup
add even more helper classes