Fix formatting and naming style.