Updated a few files to see if this works. Cleaned formatting.