Clean up & better top 40