Cleaned it up so it's easier to import.