Stat - little cleanup