small tidy up to make code more readable