Code clean  up.