#15 CartBlock, FillerBlock refactoring