Code cleanup/ StatSystem/