Feature/refactoring

refactor Calc to instance
make more methods
add some correct tests