[CHANGE] Code reformatting