Reduced coupling in flightservice, and refactor and optimization of code.