lc - refractoring done