Code Clean up and New Script For ARR Rules