Extract tarball source

Clean up a metric ton of code smells