refactoring block class
refactoring