Consistent formatting

Changed to one var per declaration block.