[mr2734] Some style changes