Fixed up spacing and metadata