Minor edit - code 'clean-up'