MTF: Code cleanup