Clean up for readability