code formatting based on DB's comments