Clean up and improve help