Fix formatting and naming conventions
formatting improvements