[EpgSelection] some code cleanup and optimisation.