Update on code cleaning = cont'd