Cleanup and beautify-ing pgs-badger
Distribution related stuff