I don't like dangling commas, can you remove while in this code?