Remove dead variable pointed out by GCC 4.6 warnings, and reflow this a little