Slight tidy up to make it more readable