First round of style clean up.