Style fixes to match project further.