minor styling and naming changes