Improve order of block variables for readability