Minor changes

mostly code cleaning