starter code cleanup