Block system, refactoring