Refactored block container by using the one in BlockBundle
Improved code readability
Merge pull request #261 from Bladrak/refactoredBlockContainer

Refactored block container by using the one in BlockBundle