Code clened up.