clean up code + improvements mcdu