Improve organization of block words