Code consistency review part 1
merge