formatting and naming updates