Fix spacing and naming issues