some format and style corrections