Google Fonts bug fix & some code cleanup

Here I am, fumbling around in GitHub again.