Clean up and add clarity