Re-unified coding style.