Updated styling and naming conventions.