Code reformat to standardize, sorry
merge from upstream