remove not necessary calc_velocity()s
implement Boundary class
code clean-up
code clean-up
code clean-up