Tidy up and clarification