Please avoid mixing style changes together with functionality changes.