Consistent formatting and naming