cleaning up spacing and style