needs code cleanup