(flight) bug with clearCompleted.

RE: The bug caught in #482

Play around with this and see if I broke anything else :scream_cat: 

I also went over code style stuff.