Organize for hopefully better clarity.