Standards fixes, alignment.