Clean up for better source