Code tidy in response to review
Code tidy