name change and code cleanup