refactoring
refactoring 2
refactoring 3
Merge branch 'master' of https://github.com/availabs/tda