Fix format of files, remove class not used and improved business logic on select new races