Blocks removing added

And a little bit refactoring.