formatting and naming improvements