refactoring
add to __init__