Refactoring tiling scheme