Clean up for readability, organization
Clean up for readability, organization