Clean up and improve readability