Clean up code for clarity