third commit - code cleanup