Slight modifications and tidying.