#422. Minor changes in code format.