I think the code that was there before did this very well I would consider reverting the changes made here, I do not believe there was any bugs or standardisation problems there