Comments and tidying.
More comments