Cleanup and corrections for better distribution