Cleaned up formatting, using vanilla GPL