Clean Fix

Changes according to Frank