changed - code cleanup