Refactor: creating beam factory class
Make to use BeamFactroy when creating a beam
Remove unused codes
Merge pull request #119 from soltycabbage/feature/refactor-beam

Refactor beam