Editted some format