Hopefully this organization is cleaner