code cleanup - function rename to something more meaningful