Change the structure for readability, maybe.