first draft
fixes spacing and formatting issues