Looks good but one question, why are you making this change is there a problem with the old code? If yes, then I need to create tasks to make sure we fix this everywhere.