cleared up spacing and naming issues