Some codecleaning