small code beauty changes
conflict resolved