Coding style changes. Small template changes.