Clean up code to enhance readability