Massive cleanup and reformatting in preparation for a long relationship with GP