#371 code formatting