Did a little refactoring to Stat