Clean up names to make code easier to understand