Cleaned up spacing and naming