code cleanup - undefined methods