minor format and naming changes