Minor tidy and restructure