Fixed styling and naming