Little refactoring

Please when you write do in mind that Flight is the class that handles
all changes