[#13] simple refactoring of blocks