Consistent Heading

Use consistent indentation and naming.