Remove while True

I'm not sure what this is doing and why it is here, so remove it to see.
Sort out while True:, make presentable.