MEF - Tidy and fix line bug