Fork is having issues running and not maintained. Switch to upstream.
Also fix some minor formatting.