Mostly organisation and commenting changes