Fix formatting and naming conventions